merge trunk
authorKenichi Handa <handa@etlken>
Tue, 25 May 2010 00:35:50 +0000 (09:35 +0900)
committerKenichi Handa <handa@etlken>
Tue, 25 May 2010 00:35:50 +0000 (09:35 +0900)
commit4e5071c33eb89dd91b8ac1107c1243b6ad1483b6
tree99715aba3ea22242a7dfc7211d95ce30cd996cec
parent980cb85d4ef6518a12f01bec37922cfad49bb820
parenta2bf2cbc37f47c9c61be7ec83b7cec8dd6d8d789
merge trunk
src/ChangeLog
src/dispextern.h
src/xdisp.c